Clean up Lobby & Server in general #261
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
SKoschnicke
reviewed
Apr 17, 2020
There was a problem hiding this comment.
Sieht soweit gut aus.
Zwei Dinge:
- gab es keine Moeglichkeit beim Refactoring des GameRooms ein paar mehr Tests zu erstellen?
- GameResult ist relevant fuer XStream. In der Vergangenheit hatten wir Probleme mit XStream wenn annotierte Klassen nach Kotlin umgewandelt wurden. Hast du verifiziert, dass das XML korrekt erstellt und geparst wird?
xeruf
force-pushed
the
fix/improve-lobby
branch
from
0a875d3 to
4dc50db
Compare
anarchuser
reviewed
Apr 28, 2020
xeruf
force-pushed
the
fix/improve-lobby
branch
2 times, most recently
from
2c2e49b to
115bd47
Compare
anarchuser
reviewed
May 3, 2020
anarchuser
reviewed
May 3, 2020
xeruf
force-pushed
the
fix/improve-lobby
branch
2 times, most recently
from
6032a1d to
ca82f1a
Compare
|
|
# Conflicts: # server/src/sc/server/Lobby.kt # server/src/sc/server/network/ClientManager.java # server/src/sc/server/network/NewClientListener.java
…gh a separate method # Conflicts: # server/src/sc/server/Lobby.kt # server/src/sc/server/network/ClientManager.java # server/src/sc/server/network/NewClientListener.java
# Conflicts: # server/src/sc/server/Lobby.kt # server/src/sc/server/network/ClientManager.java # server/src/sc/server/network/NewClientListener.java
# Conflicts: # server/src/sc/server/Lobby.kt # server/src/sc/server/network/ClientManager.java # server/src/sc/server/network/NewClientListener.java
# Conflicts: # server/src/sc/server/Lobby.kt # server/src/sc/server/network/ClientManager.java # server/src/sc/server/network/NewClientListener.java
# Conflicts: # server/src/sc/server/Lobby.kt # server/src/sc/server/network/ClientManager.java # server/src/sc/server/network/NewClientListener.java
# Conflicts: # server/src/sc/server/Lobby.kt # server/src/sc/server/network/ClientManager.java # server/src/sc/server/network/NewClientListener.java
Previously it didn't have an equals method, making proper testing almost impossible. Also removes isRegular from the XML. # Conflicts: # server/src/sc/server/Lobby.kt # server/src/sc/server/network/ClientManager.java # server/src/sc/server/network/NewClientListener.java
xeruf
force-pushed
the
fix/improve-lobby
branch
2 times, most recently
from
4ffb31a to
7d78e08
Compare
xeruf
force-pushed
the
fix/improve-lobby
branch
from
7d78e08 to
8630863
Compare
|
@anarchuser the GameResultTest is failing because the ITeam is not serialized like the PlayerColor by XStream. We need to investigate that. |
|
@SKoschnicke I am not quite sure how much there is to test in the GameRoom |
|
@SKoschnicke @anarchuser please do a final review, then I'll merge this with a regular commit - finally! |
SKoschnicke
approved these changes
Sep 29, 2020
anarchuser
reviewed
Sep 29, 2020
|
|
||
| fun size(): Int = parts.size | ||
|
|
||
| val values: List<BigDecimal> |
There was a problem hiding this comment.
Didn't we want to get rid of BigDecimal?
Or is there a good reason to keep it?
There was a problem hiding this comment.
I don't think the scores will ever go out of int range. Can't think of a good reason.
There was a problem hiding this comment.
If we average them, they may not be int anymore. And if we get floating-point errors in a championship scoring, we have a problem. Better safe than sorry I'd say.
anarchuser
reviewed
Sep 29, 2020
anarchuser
approved these changes
Sep 29, 2020
xeruf
force-pushed
the
fix/improve-lobby
branch
from
7a9d754 to
8de7a00
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Many useful more or less independent changes - reviewing the commits independently might be easier, this will also be a rebase merge :)